From e1596258deb313240856bf9b1064d4a78b4c2108 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Wed, 26 Nov 2025 16:49:24 -0800 Subject: [PATCH] Make the new merge_alter test indifferent to extra version info Modify the test regex to accept any extra version info, just like it accepts any server version info. The test is supposed to fail on actual differences in behaviour and server info strings are intentionally normalized and not regarded. Without this modification, the test introduced in 9e8e215e would fail in post-build MTR on "from Debian-log" and in autopkgtest on "from Debian": main.merge_alter w4 [ fail ] Test ended at 2025-11-26 22:41:38 CURRENT_TEST: main.merge_alter /usr/share/mariadb/mariadb-test/main/merge_alter.result 2025-11-13 11:45:29.000000000 +0300 /tmp/tmp.3vGjZWHA79/var/4/log/merge_alter.reject 2025-11-27 01:41:38.523996124 +0300 @@ -10,7 +10,7 @@ /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; DELIMITER /*!*/; # at # -#010909 4:46:40 server id # end_log_pos # CRC32 XXX Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup +#010909 4:46:40 server id # end_log_pos # CRC32 XXX Start: binlog v 4, server v #.##.## from Debian created 010909 4:46:40 at startup ROLLBACK/*!*/; # at # #010909 4:46:40 server id # end_log_pos # CRC32 XXX Gtid list [] Result length mismatch Forwarded: not-needed Gbp-Pq: Name include-debian-in-test-merge-alter-result.patch --- mysql-test/main/merge_alter.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/main/merge_alter.test b/mysql-test/main/merge_alter.test index 8094fd4e9..fb0bc4957 100644 --- a/mysql-test/main/merge_alter.test +++ b/mysql-test/main/merge_alter.test @@ -14,7 +14,7 @@ insert into t values(1,1,1); flush logs; let $MYSQLD_DATADIR= `select @@datadir`; ---replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /CRC32 0x[0-9a-f]*/CRC32 XXX/ /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ /xid=\d*/xid=/ +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /## [a-zA-Z0-9- ]+ created/## created/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /CRC32 0x[0-9a-f]*/CRC32 XXX/ /collation_server=[0-9]+/collation_server=X/ /character_set_client=[a-zA-Z0-9]+/character_set_client=X/ /collation_connection=[0-9]+/collation_connection=X/ /xid=\d*/xid=/ --exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 drop table t,t3; -- 2.30.2